bitkeeper revision 1.1399 (42820c16ZkkGzrd1OssY0unvIvY5Cw)

Merge http://xen.bkbits.net:8080/xeno-unstable.bk
into gandalf.hpl.hp.com:/var/bk/xeno-unstable.bk

diff --cc .rootkeys
Simple merge

diff --cc tools/python/xen/xend/XendClient.py
index 6b29f21e7b35b9a40ff72c0dc1235365fcddb0b8,c762cb64a91ae247019095ec4805ca47788ac35c..0be643a47f5afde6f5849ecd8f046e0fcbd0a891
--- 1/tools/python/xen/xend/XendClient.py
--- 2/tools/python/xen/xend/XendClient.py
+++ b/tools/python/xen/xend/XendClient.py
@@@ -250,16 -260,19 +250,25 @@@ class Xend
                                'warpl'    : warpl,
                                'warpu'    : warpu })
  
+     def xend_domain_cpu_sedf_set(self, id, period, slice, latency, extratime, weight):
+         return self.xendPost(self.domainurl(id),
+                              {'op'        : 'cpu_sedf_set',
+                               'period'    : period,
+                               'slice'     : slice,
+                             'latency'   : latency,
+                             'extratime' : extratime,
+                             'weight'    : weight })
+ 
      def xend_domain_maxmem_set(self, id, memory):
          return self.xendPost(self.domainurl(id),
 -                             { 'op'     : 'maxmem_set',
 -                               'memory' : memory })
 +                             { 'op'      : 'maxmem_set',
 +                               'memory'  : memory })
 +
 +    def xend_domain_mem_target_set(self, id, mem_target):
 +        val = self.xendPost(self.domainurl(id),
 +                            {'op'        : 'mem_target_set',
 +                             'target'    : mem_target })
 +        return val
  
      def xend_domain_vif_limit(self, id, vif, credit, period):
          return self.xendPost(self.domainurl(id),

diff --cc tools/python/xen/xend/XendDomain.py
Simple merge

diff --cc tools/python/xen/xend/server/SrvDomain.py
index 80fbd97703265fee244ba4cba8aade4d517c0776,0bc011337ee683f5fa78fa0b6fac8d56f87ceb5a..b58b0dd947a06571ee5881454594573293d11f18
--- 1/tools/python/xen/xend/server/SrvDomain.py
--- 2/tools/python/xen/xend/server/SrvDomain.py
+++ b/tools/python/xen/xend/server/SrvDomain.py
@@@ -103,9 -107,21 +103,21 @@@ class SrvDomain(SrvDir)
          val = fn(req.args, {'dom': self.dom.id})
          return val
      
+     
+     def op_cpu_sedf_set(self, op, req):
+         fn = FormFn(self.xd.domain_cpu_sedf_set,
+                     [['dom', 'str'],
+                      ['period', 'int'],
+                      ['slice', 'int'],
+                    ['latency', 'int'],
+                    ['extratime', 'int'],
+                    ['weight', 'int']])
+         val = fn(req.args, {'dom': self.dom.id})
+         return val
+ 
      def op_maxmem_set(self, op, req):
          fn = FormFn(self.xd.domain_maxmem_set,
 -                    [['dom', 'str'],
 +                    [['dom',    'str'],
                       ['memory', 'int']])
          val = fn(req.args, {'dom': self.dom.id})
          return val

diff --cc tools/python/xen/xm/main.py
Simple merge